bitkeeper revision 1.1159.1.441 (41a1c3b8bTHk_2Uj7_0jjGdOGPEIsw)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp

diff --cc xen/arch/x86/idle0_task.c
index 8dc2784e7c1f45b137eab05824e841cd84f736f3,a8c670c573d63ecee3cbfe9dae360193ce61f797..cc31d7df1bfcc6e620a7ea62be52d8187dbd61f3
--- 1/xen/arch/x86/idle0_task.c
--- 2/xen/arch/x86/idle0_task.c
+++ b/xen/arch/x86/idle0_task.c
@@@ -2,30 -2,16 +2,23 @@@
  #include <xen/sched.h>
  #include <asm/desc.h>
  
 -#define IDLE0_TASK(_t)           \
 -{                                \
 -    processor:   0,              \
 -    id:          IDLE_DOMAIN_ID, \
 -    mm:          IDLE0_MM,       \
 -    thread:      INIT_THREAD,    \
 -    flags:       1<<DF_IDLETASK, \
 -    refcnt:      ATOMIC_INIT(1)  \
 +#define IDLE0_EXEC_DOMAIN(_ed,_d)    \
 +{                                    \
 +    processor:   0,                  \
 +    mm:          IDLE0_MM,           \
 +    thread:      INIT_THREAD,        \
 +    domain:      (_d)                \
  }
  
 -struct domain idle0_task = IDLE0_TASK(idle0_task);
 +#define IDLE0_DOMAIN(_t)             \
 +{                                    \
 +    id:          IDLE_DOMAIN_ID,     \
 +    d_flags:     1<<DF_IDLETASK,     \
 +    refcnt:      ATOMIC_INIT(1)      \
 +}
 +
 +struct domain idle0_domain = IDLE0_DOMAIN(idle0_domain);
 +struct exec_domain idle0_exec_domain = IDLE0_EXEC_DOMAIN(idle0_exec_domain,
 +                                                         &idle0_domain);
  
- /*
-  * per-CPU TSS segments. Threads are completely 'soft' on Linux,
-  * no more per-task TSS's. The TSS size is kept cacheline-aligned
-  * so they are allowed to end up in the .data.cacheline_aligned
-  * section. Since TSS's are completely CPU-local, we want them
-  * on exact cacheline boundaries, to eliminate cacheline ping-pong.
-  */ 
- struct tss_struct init_tss[NR_CPUS] __cacheline_aligned;
+ struct tss_struct init_tss[NR_CPUS];

diff --cc xen/arch/x86/irq.c
Simple merge

diff --cc xen/arch/x86/memory.c
Simple merge

diff --cc xen/arch/x86/smpboot.c
Simple merge

diff --cc xen/arch/x86/traps.c
Simple merge

diff --cc xen/common/domain.c
Simple merge

diff --cc xen/include/asm-x86/config.h
Simple merge

diff --cc xen/include/asm-x86/processor.h
Simple merge

diff --cc xen/include/xen/irq.h
Simple merge

diff --cc xen/include/xen/sched.h
Simple merge